Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sat, 25 Sep 2010 19:19:41 +0000 (15:19 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 25 Sep 2010 19:19:41 +0000 (15:19 -0400)

Trivial merge